Commit a patch by Behdad to fix typos, omissions and other errors in the

2006-09-10  Matthias Clasen  <mclasen@redhat.com>

        * Commit a patch by Behdad to fix typos, omissions and other
        errors in the symbol aliasing, and add checks for local PLT
        entries.  (#354687, Behdad Esfahbod)

diff --git a/ChangeLog b/ChangeLog
index fe29f6823344498732a12b423a117956c181996c..9dc67e473957f9ee27b760660f7e0035e8e71074 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-09-10  Matthias Clasen  <mclasen@redhat.com>
 
+       * Commit a patch by Behdad to fix typos, omissions and other
+       errors in the symbol aliasing, and add checks for local PLT
+       entries.  (#354687, Behdad Esfahbod)
+
        * gtk/gtktreeview.c (gtk_tree_view_search_scroll_event): Renew
        the flush timeout.  (#354043, Nelson Benitez)
        

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index bcbdcf4477b37bd8cee2e8667ee9a4c8703cab49..826d1f77756882b2048edfbf04d8c59a948d67b7 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -50,7 +50,7 @@ gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
         $(PERL) $(srcdir)/makegdkpixbufalias.pl -def < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = abicheck.sh pltcheck.sh
 endif
 
 lib_LTLIBRARIES =              \
@@ -273,7 +273,6 @@ INCLUDES = \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"      \
        -DGTK_VERSION=\"$(GTK_VERSION)\"        \
        -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"  \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        -DGTK_PREFIX=\"$(prefix)\"              \
        $(INCLUDED_LOADER_DEFINE)               \
        $(GTK_DEBUG_FLAGS)                      \

diff --git a/gdk-pixbuf/abicheck.sh b/gdk-pixbuf/abicheck.sh
index 2d2a8d19fb2878dc2858172886b0aac30b167848..dd8f37a61e041d86682ee0711264606356fcb20a 100755 (executable)
--- a/gdk-pixbuf/abicheck.sh
+++ b/gdk-pixbuf/abicheck.sh
@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
 nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c
index 3476bfed4b3f1658700c7a4ad8e67fa4ff2963f0..95103ff95f1998bc9f203664ace7db364588c65e 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-io.c
+++ b/gdk-pixbuf/gdk-pixbuf-io.c
@@ -2277,7 +2277,3 @@ gdk_pixbuf_get_formats (void)
 
 #define __GDK_PIXBUF_IO_C__
 #include "gdk-pixbuf-aliasdef.c"
-
-
-
-

diff --git a/gdk-pixbuf/gdk-pixbuf.c b/gdk-pixbuf/gdk-pixbuf.c
index 944ae6ba94ce31a4da51911e98978893bb1c194e..42c91887b567a2aedd36d6b58ab74aa42f49d35f 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.c
+++ b/gdk-pixbuf/gdk-pixbuf.c
@@ -30,6 +30,9 @@
 #define GDK_PIXBUF_COMPILATION
 #include "gdk-pixbuf.h"
 #include "gdk-pixbuf-private.h"
+/* Include the marshallers */
+#include <glib-object.h>
+#include "gdk-pixbuf-marshal.c"
 #include "gdk-pixbuf-alias.h"
 
 static void gdk_pixbuf_finalize     (GObject        *object);
@@ -753,11 +756,5 @@ gdk_pixbuf_get_property (GObject         *object,
           }
 }
 
-\f
-
-/* Include the marshallers */
-#include <glib-object.h>
-#include "gdk-pixbuf-marshal.c"
-
 #define __GDK_PIXBUF_C__
 #include "gdk-pixbuf-aliasdef.c"

diff --git a/gdk-pixbuf/gdk-pixdata.c b/gdk-pixbuf/gdk-pixdata.c
index ddafb0ef18d0d3b9a07e1bc5a18586dc9235f79f..266d20eb44492407a9773f63570297a67ae7c23b 100644 (file)
--- a/gdk-pixbuf/gdk-pixdata.c
+++ b/gdk-pixbuf/gdk-pixdata.c
@@ -17,9 +17,9 @@
  * Boston, MA 02111-1307, USA.
  */
 #include <config.h>
-#include "gdk-pixdata.h"
 
 #include "gdk-pixbuf-private.h"
+#include "gdk-pixdata.h"
 #include "gdk-pixbuf-alias.h"
 #include <string.h>
 

diff --git a/gdk-pixbuf/pltcheck.sh b/gdk-pixbuf/pltcheck.sh
new file mode 100755 (executable)
index 0000000..7c0dd52
--- /dev/null
+++ b/gdk-pixbuf/pltcheck.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+LANG=C
+
+status=0
+
+if ! which readelf 2>/dev/null >/dev/null; then
+       echo "'readelf' not found; skipping test"
+       exit 0
+fi
+
+for so in .libs/libgdk_pixbuf*.so; do
+       echo Checking $so for local PLT entries
+       readelf -r $so | grep 'JU\?MP_SLOT' | grep 'gdk_pixbuf' && status=1
+done
+
+exit $status

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e4762b2bb66d24d84be26b3aea6f4f2cbdc03d75..6d341ff6005da71fb7913e1fc0545757b4b3926a 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -24,8 +24,7 @@ INCLUDES =                              \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED        \
+       -DGDK_PIXBUF_DISABLE_DEPRECATED \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 
@@ -199,7 +198,7 @@ gdkaliasdef.c: gdk.symbols
         $(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
 
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS = pltcheck.sh abicheck.sh
 endif
 
 

diff --git a/gdk/abicheck.sh b/gdk/abicheck.sh
index 6832afd73c775b619cc086e913feeb5e2bb00f29..e8ed7f41912693bb2197cde449793ab92464dd24 100755 (executable)
--- a/gdk/abicheck.sh
+++ b/gdk/abicheck.sh
@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
 nm -D -g --defined-only .libs/libgdk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 103ed0cb5edb295d811e09ab3f38baaed938e4bb..b84fef78d6829a9bf64191fd6bb42cd5d1e1d0c4 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -137,15 +137,12 @@ gdk_threads_set_lock_functions
 #endif
 
 #if IN_HEADER(__GDK_H__)
-#if IN_FILE(__GDK_INPUT_C__)
+#if IN_FILE(__GDK_EVENTS_C__)
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_input_add
 gdk_input_remove
 gdk_input_add_full
 #endif
-#ifdef GTK_COMPILATION
-gdk_input_add_full
-#endif
 #endif
 #endif
 
@@ -642,9 +639,6 @@ gdk_window_clear_area
 gdk_window_clear_area_e
 gdk_window_constrain_size
 gdk_window_destroy
-#ifndef GDK_DISABLE_DEPRECATED
-gdk_window_destroy_notify
-#endif
 gdk_window_end_paint
 gdk_window_foreign_new
 gdk_window_freeze_updates
@@ -1092,6 +1086,12 @@ gdk_synthesize_window_state
 #endif
 #endif
 
+#if IN_HEADER(__GDK_PRIVATE_H__)
+#if IN_FILE(__GDK_WINDOW_X11_C__)
+gdk_window_destroy_notify
+#endif
+#endif
+
 #ifdef GDK_WINDOWING_WIN32
 #if IN_HEADER(__GDK_WIN32_H__)
 #if IN_FILE(__GDK_WIN32ID_C__)

diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index 3a033caf3d325d8f201cf13198fc140fa07fb691..4a512fea15a22d356e21e5d888ea5a95d2c98983 100644 (file)
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -30,6 +30,7 @@
 
 #include "gdktypes.h"
 #include "gdkprivate.h"
+#include "gdkalias.h"
 
 guint               _gdk_debug_flags = 0;
 gint                _gdk_error_code = 0;

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index 43d2a18b790a33282a931b4c14042aee901011ce..a5c971dbcd8b1158bc4c29b5f51b733ff39aa5e5 100644 (file)
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -28,9 +28,8 @@
 #include "gdkrgb.h"
 #include "gdkprivate.h"
 #include "gdkscreen.h"
-#include "gdkalias.h"
-
 #include "gdkintl.h"
+#include "gdkalias.h"
 
 #define GDK_INFO_KEY "gdk-info"
 

diff --git a/gdk/pltcheck.sh b/gdk/pltcheck.sh
new file mode 100755 (executable)
index 0000000..ac66999
--- /dev/null
+++ b/gdk/pltcheck.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+LANG=C
+
+status=0
+
+if ! which readelf 2>/dev/null >/dev/null; then
+       echo "'readelf' not found; skipping test"
+       exit 0
+fi
+
+for so in .libs/lib*.so; do
+       echo Checking $so for local PLT entries
+       readelf -r $so | grep 'JU\?MP_SLOT' | grep -v 'gdk_pixbuf' | grep gdk && status=1
+done
+
+exit $status

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index a4ee87854c4e214413142e8e503cb4cf7de1639a..1730fb34bde67e7a82fc3756cc3824d1eb0fa40e 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -9,7 +9,6 @@ INCLUDES =                              \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED        \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 

diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c
index 5332bc5edeecae32a74eda875c4bd655f7e44ac0..f769caadc1157a9ebb6ebb508890844e60a90bd2 100644 (file)
--- a/gdk/x11/gdkglobals-x11.c
+++ b/gdk/x11/gdkglobals-x11.c
@@ -29,6 +29,7 @@
 
 #include "gdktypes.h"
 #include "gdkprivate-x11.h"
+#include "gdkalias.h"
 
 gboolean          _gdk_use_xshm = TRUE;  /* used as a cmd line arg */
 Display          *gdk_display = NULL;

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index a514461545572493c25dc9d5152b73d9e68872da..1849efd850ba4face82f1b48d4b799a997ce7096 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -33,7 +33,6 @@ INCLUDES =                                            \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
        -DGDK_DISABLE_DEPRECATED                        \
-       -DGTK_DISABLE_DEPRECATED                        \
        -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED            \
        -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED          \
        $(GTK_DEBUG_FLAGS)                              \
@@ -89,8 +88,15 @@ gtkalias.h: gtk.symbols
 gtkaliasdef.c: gtk.symbols
          $(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
 
+check-aliases:
+       @$(TESTS_ENVIRONMENT) $(srcdir)/aliasfilescheck.sh
+
+.PHONY: check-aliases
+
+TESTS_ENVIRONMENT = gtk_all_c_sources="$(gtk_all_c_sources)"
+TESTS = aliasfilescheck.sh
 if OS_LINUX
-TESTS = abicheck.sh
+TESTS += abicheck.sh pltcheck.sh
 endif
 
 # libtool stuff: set version and export symbols for resolving
@@ -319,7 +325,7 @@ gtk_unix_print_public_h_sources =    \
 
 
 # Installed header files without compatibility guarantees
-# that are not include in gtk/gtk.h
+# that are not included in gtk/gtk.h
 gtk_semi_private_h_sources =    \
        gtktextlayout.h         \
        gtkfilesystem.h
@@ -336,7 +342,11 @@ gtk_private_h_sources =            \
        gtkfilechooserutils.h   \
        gtkfilesystemmodel.h    \
        gtkfilesystemunix.h     \
+       gtkhsv.h                \
        gtkiconcache.h          \
+       gtkintl.h               \
+       gtkkeyhash.h            \
+       gtkmnemonichash.h       \
        gtkpathbar.h            \
        gtkplugprivate.h        \
        gtkprintoperation-private.h\
@@ -348,6 +358,7 @@ gtk_private_h_sources =             \
        gtksequence.h           \
        gtksocketprivate.h      \
        gtktextbtree.h          \
+       gtktextbufferserialize.h\
        gtktextchildprivate.h   \
        gtktextiterprivate.h    \
        gtktextmarkprivate.h    \
@@ -362,7 +373,7 @@ gtk_private_h_sources =             \
        gtkwindow-decorate.h
 
 # GTK+ C sources to build the library from
-gtk_c_sources =                 \
+gtk_base_c_sources =            \
        fnmatch.c               \
        gtkaboutdialog.c        \
        gtkaccelgroup.c         \
@@ -440,7 +451,6 @@ gtk_c_sources =                 \
        gtkhscrollbar.c         \
        gtkhseparator.c         \
        gtkhsv.c                \
-       gtkhsv.h                \
        gtkiconcache.c          \
        gtkiconfactory.c        \
        gtkicontheme.c          \
@@ -452,12 +462,10 @@ gtk_c_sources =                 \
        gtkimmodule.c           \
        gtkimmulticontext.c     \
        gtkinputdialog.c        \
-       gtkintl.h               \
        gtkinvisible.c          \
        gtkitem.c               \
        gtkitemfactory.c        \
        gtkkeyhash.c            \
-       gtkkeyhash.h            \
        gtklabel.c              \
        gtklayout.c             \
        gtklinkbutton.c         \
@@ -475,7 +483,6 @@ gtk_c_sources =                 \
        gtkmessagedialog.c      \
        gtkmisc.c               \
        gtkmnemonichash.c       \
-       gtkmnemonichash.h       \
        gtkmodules.c            \
        gtknotebook.c           \
        gtkobject.c             \
@@ -535,14 +542,11 @@ gtk_c_sources =                 \
        gtktextbuffer.c         \
        gtktextbufferrichtext.c \
        gtktextbufferserialize.c\
-       gtktextbufferserialize.h\
        gtktextchild.c          \
        gtktextdisplay.c        \
        gtktextiter.c           \
-       gtktextiterprivate.h    \
        gtktextlayout.c         \
        gtktextmark.c           \
-       gtktextmarkprivate.h    \
        gtktextsegment.c        \
        gtktexttag.c            \
        gtktexttagtable.c       \
@@ -584,19 +588,11 @@ gtk_c_sources =                 \
        gtkwidget.c             \
        gtkwindow-decorate.c    \
        gtkwindow.c             \
-       xembed.h                \
        $(gtk_clipboard_dnd_c_sources)
+gtk_c_sources = $(gtk_base_c_sources)
+gtk_all_c_sources = $(gtk_base_c_sources)
 
-if OS_UNIX
-gtk_private_h_sources += \
-       gtkfilesystemunix.h             \
-       gtkprintbackend.h               \
-       gtkprinter-private.h            \
-       gtkprinteroption.h              \
-       gtkprinteroptionset.h           \
-       gtkprinteroptionwidget.h
-
-gtk_c_sources += \
+gtk_os_unix_c_sources = \
        gtkfilesystemunix.c             \
        gtkpagesetupunixdialog.c        \
        gtkprinter.c                    \
@@ -607,30 +603,51 @@ gtk_c_sources += \
        gtkprintoperation-unix.c        \
        gtkprintunixdialog.c            \
         gtkprintbackend.c
+gtk_all_c_sources += $(gtk_os_unix_c_sources)
+if OS_UNIX
+gtk_private_h_sources += \
+       gtkfilesystemunix.h             \
+       gtkprintbackend.h               \
+       gtkprinter-private.h            \
+       gtkprinteroption.h              \
+       gtkprinteroptionset.h           \
+       gtkprinteroptionwidget.h
+gtk_c_sources += $(gtk_os_unix_c_sources)
 endif
 
-if OS_WIN32
-gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
-
-gtk_c_sources += \
+gtk_os_win32_c_sources = \
        gtkfilesystemwin32.c            \
        gtkprint-win32.c                \
        gtkprintoperation-win32.c
+gtk_all_c_sources += $(gtk_os_win32_c_sources)
+if OS_WIN32
+gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
+gtk_c_sources += $(gtk_os_win32_c_sources)
 endif
 
-if USE_X11
-gtk_private_h_sources += gtkxembed.h gtktrayicon.h
-gtk_c_sources += \
+gtk_use_x11_c_sources = \
        gtkplug-x11.c   \
        gtksocket-x11.c \
        gtkxembed.c     \
        gtktrayicon-x11.c
+gtk_use_win32_c_sources = \
+       gtkplug-win32.c   \
+       gtksocket-win32.c \
+       gtkwin32embed.c   \
+       gtkwin32embedwidget.c
+gtk_use_stuc_c_sources = \
+       gtkplug-stub.c   \
+       gtksocket-stub.c
+gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stuc_c_sources)
+if USE_X11
+gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
+gtk_c_sources += $(gtk_use_x11_c_sources)
 else
 if USE_WIN32
 gtk_private_h_sources += gtkwin32embed.h gtkwin32embedwidget.h
-gtk_c_sources +=         gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
+gtk_c_sources += $(gtk_use_win32_c_sources)
 else
-gtk_c_sources +=         gtkplug-stub.c gtksocket-stub.c
+gtk_c_sources += $(gtk_use_stub_c_sources)
 endif
 endif
 
@@ -653,7 +670,7 @@ gtk_built_public_sources =                  \
        gtkmarshal.h                            \
        gtktypebuiltins.h
 
-# built sources that don't get installed
+# built headers that don't get installed
 gtk_built_private_headers =                    \
        gtkalias.h                              \
        gtkmarshalers.h                         \
@@ -663,7 +680,6 @@ gtk_built_sources =                         \
        gtkaliasdef.c                           \
        gtktypebuiltins.c                       \
        gtkmarshalers.c                         \
-       gtkmarshalers.h                         \
        gtkmarshal.c                            \
        ${gtk_built_private_headers}            \
        ${gtk_built_public_sources}
@@ -717,7 +733,9 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
        && rm -f xgen-gmlh \
        && echo timestamp > $(@F)       
 gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
-       (echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
+       (echo "#include \"gtkmarshalers.h\""; \
+        echo "#include \"gtkalias.h\""; \
+        $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
        && cp xgen-gmlc gtkmarshalers.c \
        && rm -f xgen-gmlc
 
@@ -731,7 +749,11 @@ stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
        && rm -f xgen-gmh \
        && echo timestamp > $(@F)
 gtkmarshal.c: @REBUILD@ gtkmarshal.list
-       (echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body) >> xgen-gmc \
+       (echo "#include \"gtkmarshal.h\""; \
+        echo "#include \"gtkalias.h\""; \
+        $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body; \
+        echo "#define __gtk_marshal_MARSHAL_C__"; \
+        echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
        && cp xgen-gmc gtkmarshal.c \
        && rm -f xgen-gmc 
 

diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh
index b1c27f3451471654e1f4bf32ea76c936d4dad849..f657d465cf1bf0410b6338bbe1ec744ce8ae8710 100755 (executable)
--- a/gtk/abicheck.sh
+++ b/gtk/abicheck.sh
@@ -2,4 +2,4 @@
 
 cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
 nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
-diff -u expected-abi actual-abi && rm expected-abi actual-abi
+diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
new file mode 100755 (executable)
index 0000000..f350663
--- /dev/null
+++ b/gtk/aliasfilescheck.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+if test "x$gtk_all_c_sources" = x; then
+       echo gtk_all_c_sources variable not defined
+       exit 1
+fi
+
+grep 'IN_FILE' gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
+grep '^ *# *define __' $gtk_all_c_sources | sed 's/.*define //;s/ *$//' | sort > actual-files
+
+diff expected-files actual-files && rm -f expected-files actual-files
+

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index b90c633275963564c5434598677dc300852b7b53..001ef33110ecd8eea375390d8ce32f119689762a 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -596,8 +596,8 @@ gtk_check_button_new_with_mnemonic
 #endif
 #endif
 
-#if IN_HEADER(__GTK_MENU_CHECK_ITEM_H__)
-#if IN_FILE(__GTK_MENU_CHECK_ITEM_C__)
+#if IN_HEADER(__GTK_CHECK_MENU_ITEM_H__)
+#if IN_FILE(__GTK_CHECK_MENU_ITEM_C__)
 gtk_check_menu_item_get_active
 gtk_check_menu_item_get_draw_as_radio
 gtk_check_menu_item_get_inconsistent
@@ -884,8 +884,8 @@ gtk_container_unset_focus_chain
 #endif
 #endif
 
-#if IN_HEADER(__C_TREE_H__)
-#if IN_FILE(__G_TREE_C__)
+#if IN_HEADER(__GTK_CTREE_H__)
+#if IN_FILE(__GTK_CTREE_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_ctree_collapse
 gtk_ctree_collapse_recursive
@@ -1477,7 +1477,6 @@ gtk_file_system_unix_new
 #ifdef G_OS_WIN32
 gtk_file_system_win32_get_type G_GNUC_CONST
 gtk_file_system_win32_new
-_gtk_file_system_win32_path_compare
 #endif
 #endif
 #endif
@@ -1537,8 +1536,8 @@ gtk_font_button_set_use_size
 #endif
 #endif
 
-#if IN_HEADER(__GTK_FONSEL_H__)
-#if IN_FILE(__GTK_FONSEL_C__)
+#if IN_HEADER(__GTK_FONTSEL_H__)
+#if IN_FILE(__GTK_FONTSEL_C__)
 gtk_font_selection_dialog_get_font_name
 gtk_font_selection_dialog_get_preview_text
 gtk_font_selection_dialog_get_type G_GNUC_CONST
@@ -1939,7 +1938,7 @@ gtk_item_toggle
 #endif
 #endif
 
-#if IN_HEADER(__GTK_ITEM__FACTORY_H__)
+#if IN_HEADER(__GTK_ITEM_FACTORY_H__)
 #if IN_FILE(__GTK_ITEM_FACTORY_C__)
 #ifndef GTK_DISABLE_DEPRECATED
 gtk_item_factories_path_delete
@@ -2189,6 +2188,7 @@ gtk_input_dialog_new
 
 #if IN_HEADER(__gtk_marshal_MARSHAL_H__)
 #if IN_FILE(__gtk_marshal_MARSHAL_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_marshal_BOOLEAN__POINTER
 gtk_marshal_BOOLEAN__POINTER_INT_INT
 gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
@@ -2217,6 +2217,7 @@ gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
 gtk_marshal_VOID__UINT_STRING
 #endif
 #endif
+#endif
 
 #if IN_HEADER(__GTK_MENU_BAR_H__)
 #if IN_FILE(__GTK_MENU_BAR_C__)
@@ -4371,19 +4372,21 @@ gtk_vbox_new
 #endif
 #endif
 
-#if IN_HEADER(__GTK_VBUTTONBOX_H__)
-#if IN_FILE(__GTK_VBUTTONBOX_C__)
+#if IN_HEADER(__GTK_VBBOX_H__)
+#if IN_FILE(__GTK_VBBOX_C__)
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_vbutton_box_get_layout_default
 gtk_vbutton_box_get_spacing_default
-gtk_vbutton_box_get_type G_GNUC_CONST
-gtk_vbutton_box_new
 gtk_vbutton_box_set_layout_default
 gtk_vbutton_box_set_spacing_default
 #endif
+gtk_vbutton_box_get_type G_GNUC_CONST
+gtk_vbutton_box_new
+#endif
 #endif
 
-#if IN_HEADER(__GTK_VIEPORT_H__)
-#if IN_FILE(__GTK_VIEPORT_C__)
+#if IN_HEADER(__GTK_VIEWPORT_H__)
+#if IN_FILE(__GTK_VIEWPORT_C__)
 gtk_viewport_get_hadjustment
 gtk_viewport_get_shadow_type
 gtk_viewport_get_type G_GNUC_CONST
@@ -4687,6 +4690,14 @@ gtk_window_unstick
 #endif
 #endif
 
+#if IN_HEADER(__GTK_WIN32_EMBED_WIDGET_H__)
+#if IN_FILE(__GTK_WIN32_EMBED_WIDGET_C__)
+#ifdef G_OS_WIN32
+gtk_win32_embed_widget_get_type G_GNUC_CONST
+#endif
+#endif
+#endif
+
 #ifdef INCLUDE_VARIABLES
 gtk_binary_age
 gtk_interface_age

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 7e75fd1549e08b12bfbe223acaa4d121408f7677..13762a0604a0199a66c6106c81a164efe3e2ff6e 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -49,7 +49,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkcalendar.h"
-#define GTK_DISABLE_DEPRECATED
 
 #include "gtkdnd.h"
 #include "gtkintl.h"

diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index ba87b429739f2e84a75c4758a9da414d5e5981b0..2922a4ccff51ba3b6c4bb27b796ea6e84bd0957d 100644 (file)
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -30,10 +30,9 @@
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 #include "gtktextbuffer.h"
-
 #include "gtkquartz.h"
+#include "gtkalias.h"
 
 enum {
   OWNER_CHANGE,

diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 1f2f72cf47dd8c4e4e84452192fc2725cf5ea823..606aaf085679028715032bdabe65ec08727af96d 100644 (file)
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -43,9 +43,8 @@
 #include "gtkstock.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
-
 #include "gtkquartz.h"
+#include "gtkalias.h"
 #include "gdk/quartz/gdkquartz.h"
 
 typedef struct _GtkDragSourceSite GtkDragSourceSite;

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0d0f056b67e16f28114d9feb448512dca3edbe75..71376c6d54485277997933594c1aed693b708935 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -43,6 +43,7 @@
 #include "gtkstock.h"
 #include "gtkwindow.h"
 #include "gtkintl.h"
+#include "gtkdndcursors.h"
 #include "gtkalias.h"
 
 static GSList *source_widgets = NULL;
@@ -300,8 +301,6 @@ static void     set_icon_stock_pixbuf          (GdkDragContext    *context,
  * Cursor and Icon data *
  ************************/
 
-#include "gtkdndcursors.h"
-
 static struct {
   GdkDragAction action;
   const gchar  *name;

diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index ce454a372b8cb1938ebb6dea0e58e67b8d6c8525..a1a321d3cf028985a48d04c9b8f105bd9f028e01 100644 (file)
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -32,8 +32,8 @@
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include <gdk/gdkkeysyms.h>
-#include "gtkalias.h"
 #include "gtkdnd.h"
+#include "gtkalias.h"
 
 #define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))
 

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 74d2dc5439802e9771dbf0f24930374a25d1fe05..e580f894dc4b7158fda3cab6276ac6aa81a39ee6 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -8670,6 +8670,3 @@ shortcuts_model_filter_new (GtkFileChooserDefault *impl,
 
   return GTK_TREE_MODEL (model);
 }
-
-#define __GTK_FILE_CHOOSER_DEFAULT_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkfilechooserembed.c b/gtk/gtkfilechooserembed.c
index b3d4414f91a8eeb6515af0c8f18b25f53c7d9f0e..68415b459acea8386002d36af6c4a70b15cb1689 100644 (file)
--- a/gtk/gtkfilechooserembed.c
+++ b/gtk/gtkfilechooserembed.c
@@ -219,6 +219,3 @@ _gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
 
   GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
 }
-
-#define __GTK_FILE_CHOOSER_EMBED_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 221230483b1845de83293b3d497da615c8c4b199..4beaf1a7918d865a4641d096e892d779e67f8fd8 100644 (file)
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -1075,6 +1075,3 @@ _gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,
 
   return retval;
 }
-
-#define __GTK_FILE_CHOOSER_ENTRY_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkfilechoosersettings.c b/gtk/gtkfilechoosersettings.c
index ac1a15bafd10adf9ddcd5e62e31a0e7755133a93..dcd769220b5539ba2171b0ab95febbafe3544683 100644 (file)
--- a/gtk/gtkfilechoosersettings.c
+++ b/gtk/gtkfilechoosersettings.c
@@ -34,6 +34,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 #include "gtkfilechoosersettings.h"
+#include "gtkalias.h"
 
 /* Increment this every time you change the configuration format */
 #define CONFIG_VERSION 0

diff --git a/gtk/gtkfilechooserutils.c b/gtk/gtkfilechooserutils.c
index cbdf713769c1081a128fbab6746e79d0acea2bfe..a7220c19672f71f26c91d2d777c39ad6c794b5af 100644 (file)
--- a/gtk/gtkfilechooserutils.c
+++ b/gtk/gtkfilechooserutils.c
@@ -360,6 +360,3 @@ delegate_confirm_overwrite (GtkFileChooser    *chooser,
   g_signal_emit_by_name (data, "confirm-overwrite", &conf);
   return conf;
 }
-
-#define __GTK_FILE_CHOOSER_UTILS_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index aa7fed04c3e7d97245b338e1408ce22da9d191f3..4cd5ee503758569e0bcef1667ea262748d060053 100644 (file)
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -78,7 +78,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 
 #define WANT_HPANED 1
 #include "gtkhpaned.h"

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 7e10039871e798381b6caed0d7ecf2dcde0073d1..ce256c1f4a7d97ac6f740681335ef82a5ab829bd 100644 (file)
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -24,8 +24,8 @@
 #include "gtkicontheme.h"
 #include "gtkmodules.h"
 #include "gtkintl.h"
-#include "gtkalias.h"
 #include "gtkstock.h"
+#include "gtkalias.h"
 
 #include <string.h>
 

diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index a85ad7af87b7182b69823a8fd56b411cdec72ae7..754d0cc36bc8e4f7e45d8bedc2795b4795088562 100644 (file)
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -2021,6 +2021,3 @@ root_files_removed_callback (GtkFileFolder      *folder,
 {
   do_files_removed (model, NULL, paths);
 }
-
-#define __GTK_FILE_SYSTEM_MODEL_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 55559aac12ada77ee3fb454cdc73d7a215556359..4e4e7b655fd523710603e242ff5ab85fac4b530f 100644 (file)
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -21,6 +21,8 @@
 
 #include "gtkdebug.h"
 #include "gtkiconcache.h"
+#include "gtkalias.h"
+
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 

diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c
index ee685dd0b3100e384336e3be2bffc9cbfc8976d6..00d3ed8ddff08874a9e311ad875a88b6d3784d1b 100644 (file)
--- a/gtk/gtkinputdialog.c
+++ b/gtk/gtkinputdialog.c
@@ -52,7 +52,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 
 #include "gtkintl.h"
 #include "gtkalias.h"

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 98145a9c7f6c2c60d3f6df92edd6ec923094ae35..55aff410ef64df23abe1743aa9baf54fe342d3fd 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -32,7 +32,6 @@
 #undef GTK_DISABLE_DEPRECATED
 #include       "gtkitemfactory.h"
 #include       "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 #include       "gtkmenubar.h"
 #include       "gtkmenu.h"
 #include       "gtkmenuitem.h"
@@ -54,7 +53,7 @@
 #endif
 #include       <stdio.h>
 
-#include       "gtkalias.h"
+#include "gtkalias.h"
 
 /* --- defines --- */
 #define                ITEM_FACTORY_STRING     ((gchar*) item_factory_string)

diff --git a/gtk/gtkmnemonichash.c b/gtk/gtkmnemonichash.c
index 705484aded416e9677cef62d6fb50f032a2a21ea..51a9514510b7cd549109f8f0d819a9b964a86918 100644 (file)
--- a/gtk/gtkmnemonichash.c
+++ b/gtk/gtkmnemonichash.c
@@ -20,6 +20,7 @@
  */
 
 #include "gtkmnemonichash.h"
+#include "gtkalias.h"
 
 struct _GtkMnemnonicHash
 {

diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c
index 6430cf6e66a82908fa7f51360d953ecaac35dae6..97944f13b0eec8f8fe6743e0e243aa0ae836153d 100644 (file)
--- a/gtk/gtkmodules.c
+++ b/gtk/gtkmodules.c
@@ -27,6 +27,7 @@
 #include "gtkdebug.h"
 #include "gtkprivate.h" /* GTK_LIBDIR */
 #include "gtkintl.h" 
+#include "gtkalias.h"
 
 #include <gmodule.h>
 #include <pango/pango-utils.h> /* For pango_split_file_list */

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 18be2a7fe869e266c07534a52427284a669bd831..66c44d29d9d5b2fa6500bec4d436d6d10aa8a2a8 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -37,8 +37,8 @@
 #include "gtkmarshalers.h"
 #include "gtkbindings.h"
 #include "gtkprivate.h"
-#include "gtkalias.h"
 #include "gtkdnd.h"
+#include "gtkalias.h"
 
 #define SCROLL_DELAY_FACTOR   5
 #define SCROLL_THRESHOLD      12

diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c
index 911db07c5c527e9d605a7fc8afa73048123a0329..69e10495c402c7e552cd4bb28cd0a439b26d18bc 100644 (file)
--- a/gtk/gtkoptionmenu.c
+++ b/gtk/gtkoptionmenu.c
@@ -33,7 +33,6 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 
 #include "gtkprivate.h"
 #include "gtkalias.h"

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 5cd240cee6303103c60da01711796b5f578510a9..2f953faec2770953351773da6c29651f945c08cb 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1658,3 +1658,6 @@ _gtk_path_bar_down (GtkPathBar *path_bar)
        }
     }
 }
+
+#define __GTK_PATH_BAR_C__
+#include "gtkaliasdef.c"

diff --git a/gtk/gtkpathbar.h b/gtk/gtkpathbar.h
index 9474427b59c99f443ee6262bb592992fbc6daf13..3d32bbaad8d1b9e7b1cebf044c1802f2abc9d64a 100644 (file)
--- a/gtk/gtkpathbar.h
+++ b/gtk/gtkpathbar.h
@@ -17,8 +17,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GTK_PATH_BAR__
-#define __GTK_PATH_BAR__
+#ifndef __GTK_PATH_BAR_H__
+#define __GTK_PATH_BAR_H__
 
 #include "gtkcontainer.h"
 #include "gtkfilesystem.h"
@@ -91,4 +91,4 @@ void     _gtk_path_bar_down            (GtkPathBar *path_bar);
 
 G_END_DECLS
 
-#endif /* __GTK_PATH_BAR__ */
+#endif /* __GTK_PATH_BAR_H__ */

diff --git a/gtk/gtkplug-stub.c b/gtk/gtkplug-stub.c
index 3bd1024aab62919802251e96dc044753fd518a9a..92c5f109562fadd180e2d045eb594cff06457e2a 100644 (file)
--- a/gtk/gtkplug-stub.c
+++ b/gtk/gtkplug-stub.c
@@ -27,6 +27,7 @@
 
 #include "gtkplug.h"
 #include "gtkplugprivate.h"
+#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_plug_windowing_get_id (GtkPlug *plug)

diff --git a/gtk/gtkplug-win32.c b/gtk/gtkplug-win32.c
index bcbc5093a5fc1861cfab6ab9b74d1f79e4233aa4..58f62c9ee228de37bf8e5069f21b47f214006b75 100644 (file)
--- a/gtk/gtkplug-win32.c
+++ b/gtk/gtkplug-win32.c
@@ -33,6 +33,7 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
+#include "gtkalias.h"
 
 #if defined(_MSC_VER) && (WINVER < 0x0500)
 #ifndef GA_PARENT

diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index ae687a05d86655418aa4f503e5ef9c43279f757c..0ba2f5807cd7db94d1d45f53170ea384bdc7294f 100644 (file)
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -25,7 +25,6 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkplug.h"
@@ -35,6 +34,7 @@
 #include "x11/gdkx.h"
 
 #include "gtkxembed.h"
+#include "gtkalias.h"
 
 static void xembed_set_info            (GdkWindow     *window,
                                        unsigned long  flags);

diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index 8461bb5ae50dac6dbd3d2089b816f8e61102a306..2739f1de5f9c6b18ccf3ea9ad525e56a5657b5a2 100644 (file)
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -44,8 +44,8 @@
 #include "gtkprinter-private.h"
 #include "gtkprintjob.h"
 #include "gtklabel.h"
-#include "gtkalias.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 typedef struct 
 {

diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index f47f763dc665a9ddf83fd95363e933577db55634..159ed6d2ed7caeee5dc6341dc36bbd72415a7bd7 100644 (file)
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -40,9 +40,9 @@
 #include "gtkinvisible.h"
 #include "gtkplug.h"
 #include "gtkstock.h"
-#include "gtkalias.h"
 #include "gtk.h"
 #include "gtkwin32embedwidget.h"
+#include "gtkalias.h"
 
 #define MAX_PAGE_RANGES 20
 #define STATUS_POLLING_TIME 2000
@@ -1909,3 +1909,6 @@ gtk_print_run_page_setup_dialog_async (GtkWindow            *parent,
   done_cb (new_page_setup, data);
   g_object_unref (new_page_setup);
 }
+
+#define __GTK_PRINT_OPERATION_WIN32_C__
+#include "gtkaliasdef.c"

diff --git a/gtk/gtkprintutils.c b/gtk/gtkprintutils.c
index dced6e8a4deb10d56687e16ac76f9cea33b8c88d..33896a55a5e6227c55f23a4321e21b6d8a52da3c 100644 (file)
--- a/gtk/gtkprintutils.c
+++ b/gtk/gtkprintutils.c
@@ -20,6 +20,7 @@
 
 #include "config.h"
 #include "gtkprintutils.h"
+#include "gtkalias.h"
 
 gdouble
 _gtk_print_convert_to_mm (gdouble len, 

diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c
index 09a89dfab8474aeb59ee2b6995112f4196cb435d..a9f3f44102aafd0fcd0d13f4d7a643692ca7b8b0 100644 (file)
--- a/gtk/gtkprogress.c
+++ b/gtk/gtkprogress.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkprogress.h" 
-#define GTK_DISABLE_DEPRECATED
 #include "gtkprivate.h" 
 #include "gtkintl.h"
 #include "gtkalias.h"

diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
index 57556643cfea1315946a01af1f5a163012cc05b6..ed3c65255b305a1296bd019f8b435ee7aad5066d 100644 (file)
--- a/gtk/gtkquartz.c
+++ b/gtk/gtkquartz.c
@@ -21,6 +21,7 @@
 #include <config.h>
 
 #include "gtkquartz.h"
+#include "gtkalias.h"
 
 NSImage *
 _gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index de89c664d6db566cd2a4755e43b9f29626aa57b8..c56e1722c9de781215d56c074744afb4f92ce23e 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -2069,6 +2069,3 @@ _gtk_recent_chooser_default_new (GtkRecentManager *manager)
                       "recent-manager", manager,
                       NULL);
 }
-
-#define __GTK_RECENT_CHOOSER_DEFAULT_C__
-#include "gtkaliasdef.c"

diff --git a/gtk/gtkrecentchooserutils.c b/gtk/gtkrecentchooserutils.c
index 366e8e648e3dace68af6c0c3f82cb74e6e3edc7d..f931486c6cb9fd2b91bad4727e21917d8234539a 100644 (file)
--- a/gtk/gtkrecentchooserutils.c
+++ b/gtk/gtkrecentchooserutils.c
@@ -27,6 +27,7 @@
 #include "config.h"
 
 #include "gtkrecentchooserutils.h"
+#include "gtkalias.h"
 
 /* Methods */
 static void      delegate_set_sort_func              (GtkRecentChooser  *chooser,

diff --git a/gtk/gtksequence.c b/gtk/gtksequence.c
index ce393707884993e69bf8cd23bd7f813df3ff9a27..64e3784b018ef7dcc1105653d76b9df823f0a385 100644 (file)
--- a/gtk/gtksequence.c
+++ b/gtk/gtksequence.c
@@ -20,6 +20,7 @@
 #include <glib.h>
 
 #include "gtksequence.h"
+#include "gtkalias.h"
 
 typedef struct _GtkSequenceNode GtkSequenceNode;
 

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 36c1af79ff638c34fc0681a7edc941b2e9fab84f..2132088b84b440a26cec2a2f87e09b3ac93d0f89 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -21,7 +21,7 @@
 
 #include       <config.h>
 #include       "gtksignal.h"
-#include       "gtkalias.h"
+#include "gtkalias.h"
 
 /* the real parameter limit is of course given by GSignal, bu we need
  * an upper limit for the implementations. so this should be adjusted

diff --git a/gtk/gtksocket-stub.c b/gtk/gtksocket-stub.c
index b839048b8869cddd50b4e72cdc4d08140ef66d7c..fbc8aedcfd8e663c6d12a8447cb434aa3ee68f40 100644 (file)
--- a/gtk/gtksocket-stub.c
+++ b/gtk/gtksocket-stub.c
@@ -27,6 +27,7 @@
 
 #include "gtksocket.h"
 #include "gtksocketprivate.h"
+#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)

diff --git a/gtk/gtksocket-win32.c b/gtk/gtksocket-win32.c
index 4db3957756b6e78205e404988c6f4856add2afb3..3524a1f7ec4f53ef88395b04e2cad64c59cd0250 100644 (file)
--- a/gtk/gtksocket-win32.c
+++ b/gtk/gtksocket-win32.c
@@ -38,6 +38,7 @@
 #include "win32/gdkwin32.h"
 
 #include "gtkwin32embed.h"
+#include "gtkalias.h"
 
 GdkNativeWindow
 _gtk_socket_windowing_get_id (GtkSocket *socket)

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 9b1b6cfd1102e74e66c50b13c3f66e0df12cedb1..92d31b7722897fbbf744c952f600ffca2e39e200 100755 (executable)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -39,8 +39,6 @@
 #include "gtkprivate.h"
 #include "gtkwidget.h"
 
-#include "gtkalias.h"
-
 #ifdef GDK_WINDOWING_WIN32
 #include "gtkicontheme.h"
 #include "gtklabel.h"
@@ -49,6 +47,8 @@
 #define WM_GTK_TRAY_NOTIFICATION (WM_USER+1)
 #endif
 
+#include "gtkalias.h"
+
 #define BLINK_TIMEOUT 500
 
 enum

diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index 1d10533a067fdaa7025e3d12bb3ef8fc0d742b91..fed5bf7a89b27a8a73f1a51fc69d03f4150a40a5 100644 (file)
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -32,7 +32,6 @@
 #include "gtkmarshalers.h"
 #undef GTK_DISABLE_DEPRECATED
 #include "gtkoptionmenu.h"
-#define GTK_DISABLE_DEPRECATED
 #include "gtkrc.h"
 #include "gtkspinbutton.h"
 #include "gtkstyle.h"

diff --git a/gtk/gtktextbufferrichtext.c b/gtk/gtktextbufferrichtext.c
index cdac9d432eb616d954ebf60a047734412e8259ad..941d023a74477ffe1cc17aaac701893e4d9f0606 100644 (file)
--- a/gtk/gtktextbufferrichtext.c
+++ b/gtk/gtktextbufferrichtext.c
@@ -25,8 +25,8 @@
 
 #include "gtktextbufferrichtext.h"
 #include "gtktextbufferserialize.h"
-#include "gtkalias.h"
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 typedef struct

diff --git a/gtk/gtktextbufferserialize.c b/gtk/gtktextbufferserialize.c
index cacf6c61d102ac37bd61d4f531a49df4a9785f18..217208c4b42f5f18950410203003f757ecd4474a 100644 (file)
--- a/gtk/gtktextbufferserialize.c
+++ b/gtk/gtktextbufferserialize.c
@@ -31,8 +31,8 @@
 
 #include "gdk-pixbuf/gdk-pixdata.h"
 #include "gtktextbufferserialize.h"
-
 #include "gtkintl.h"
+#include "gtkalias.h"
 
 
 typedef struct

diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index 042365d890134630095d084f2d65b40d904f59f1..f6e482aa33d9c008a69bfc45ba443c0dada58e71 100644 (file)
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -36,7 +36,7 @@
 #include       "gtkmain.h"
 #include        "gtkmarshalers.h"
 #include       "gtkintl.h"
-#include       "gtkalias.h"
+#include "gtkalias.h"
 
 
 

diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index 2cc39f264a52d0742bb87d0d485786ed4aad0af1..c48b7dfe0f7f009c822a109fea2da1ab5443a5d2 100644 (file)
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -27,8 +27,8 @@
 #include "gtkseparatormenuitem.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
-#include "gtkalias.h"
 #include "gtkprivate.h"
+#include "gtkalias.h"
 
 #include <string.h>
 

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 6f0b16317d4c70bf62ecf736f7b9e5e3a07a5f2e..184309981a97c324099885d92ddb1651ad89fae3 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -22,8 +22,8 @@
 #include "gtktreemodelfilter.h"
 #include "gtkintl.h"
 #include "gtktreednd.h"
-#include "gtkalias.h"
 #include "gtkprivate.h"
+#include "gtkalias.h"
 #include <string.h>
 
 /* ITER FORMAT:

diff --git a/gtk/gtkvbbox.c b/gtk/gtkvbbox.c
index 076e6e9f79355aa9c6119463cb8a2ea4cd25e5b6..4f5957cd6cc5311c53a0d833c59aaed01a96af4f 100644 (file)
--- a/gtk/gtkvbbox.c
+++ b/gtk/gtkvbbox.c
@@ -277,5 +277,5 @@ gtk_vbutton_box_size_allocate (GtkWidget     *widget,
     }
 }
   
-#define __GTK_VBBOX_C__  
+#define __GTK_VBBOX_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkvbbox.h b/gtk/gtkvbbox.h
index 7889440485480ef73a90375dce7731048bcef223..8c21273c97a0c26dc15c73c581b442de71a4b5a7 100644 (file)
--- a/gtk/gtkvbbox.h
+++ b/gtk/gtkvbbox.h
@@ -24,8 +24,8 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
-#ifndef __GTK_VBUTTON_BOX_H__
-#define __GTK_VBUTTON_BOX_H__
+#ifndef __GTK_VBBOX_H__
+#define __GTK_VBBOX_H__
 
 
 #include <gtk/gtkbbox.h>
@@ -73,4 +73,4 @@ void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
 G_END_DECLS
 
 
-#endif /* __GTK_VBUTTON_BOX_H__ */
+#endif /* __GTK_VBBOX_H__ */

diff --git a/gtk/gtkwin32embed.c b/gtk/gtkwin32embed.c
index 609ec5b1cbe7537d29c22d4605d2e1137ae4f649..ce1f3d849074287243b9d27e10bdf0125918cc5f 100644 (file)
--- a/gtk/gtkwin32embed.c
+++ b/gtk/gtkwin32embed.c
@@ -26,6 +26,8 @@
 
 #include "gtkwin32embed.h"
 
+#include "gtkalias.h"
+
 static guint message_type[GTK_WIN32_EMBED_LAST];
 
 static GSList *current_messages;
@@ -130,6 +132,3 @@ _gtk_win32_embed_get_focus_wrapped (void)
 
   return (msg->lParam & GTK_WIN32_EMBED_FOCUS_WRAPAROUND) != 0;
 }
-
-
-

diff --git a/gtk/makegtkalias.pl b/gtk/makegtkalias.pl
index 3011a577cc0bffb8bafc305d422440cfa07911b4..a38afbe01b5827ce5b84521d8d357b171a69d43f 100755 (executable)
--- a/gtk/makegtkalias.pl
+++ b/gtk/makegtkalias.pl
@@ -16,11 +16,6 @@ print <<EOF;
 
 #ifdef G_HAVE_GNUC_VISIBILITY
 
-#ifndef GTK_DISABLE_DEPRECATED
-#define GTK_DISABLE_DEPRECATED
-#define REENABLE_DEPRECATED
-#endif
-
 EOF
 
 if ($do_def) {
@@ -134,10 +129,6 @@ EOF
 }
 
 print <<EOF;
-#ifdef REENABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#endif
-
 #endif /* G_HAVE_GNUC_VISIBILITY */
 #endif /* DISABLE_VISIBILITY */
 EOF

diff --git a/gtk/pltcheck.sh b/gtk/pltcheck.sh
new file mode 100755 (executable)
index 0000000..d8718ce
--- /dev/null
+++ b/gtk/pltcheck.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+LANG=C
+
+status=0
+
+if ! which readelf 2>/dev/null >/dev/null; then
+       echo "'readelf' not found; skipping test"
+       exit 0
+fi
+
+for so in .libs/lib*.so; do
+       echo Checking $so for local PLT entries
+       readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<gtk' && status=1
+done
+
+exit $status